Prepare v2009.06-rc2

Update CHANGELOG.

Signed-off-by: Wolfgang Denk <[email protected]>

diff --git a/CHANGELOG b/CHANGELOG
index b7668710cc3273e2238d045f7fa48ee901a3b2cb..813c0d9f2d8fe94446e26bd2c624e5e6757608c7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,28 @@
+commit f4317ea91942f44cc1c433277927b61618e9b0a5
+Author: Daniel Mack <[email protected]>
+Date:  Tue May 5 12:48:29 2009 +0200
+
+    ARM: fix PXA build by defining UP2OCR
+
+    U-Boot does not currently build for PXA platforms with USB support
+    enabled:
+
+    usb.c:46: error: 'UP2OCR' undeclared (first use in this function)
+
+    Signed-off-by: Daniel Mack <[email protected]>
+    Cc: Markus Klotzbuecher <[email protected]>
+
+    Edited commit message.
+    Signed-off-by: Wolfgang Denk <[email protected]>
+
+commit e26ad0eabd10a8cda51920fbcfe4da5b4ccf0c98
+Author: Wolfgang Denk <[email protected]>
+Date:  Fri May 15 22:32:57 2009 +0200
+
+    Minor Coding Style fix; update CHANGELOG.
+
+    Signed-off-by: Wolfgang Denk <[email protected]>
+
 commit af75a45d23b72a59ac5cc0427696c7f634fdc94b
 Author: Wolfgang Denk <[email protected]>
 Date:  Fri May 15 09:27:58 2009 +0200

diff --git a/Makefile b/Makefile
index 137c88f42e412e02ee18868d9362c0405831caba..24e6410ebe20f0f5d1bea3f90484b65358e8e930 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 2009
 PATCHLEVEL = 06
 SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else